xend: pass-through: Use PCIDevice as the parameter for the constructor for PCIQuirk

Signed-off-by: Simon Horman <horms@verge.net.au>

diff --git a/tools/python/xen/xend/server/pciif.py b/tools/python/xen/xend/server/pciif.py
index 0806905ea01ec172419c3d509215064b95d20701..c84d6551433fb1a1c675aec3d6ab3fe6ed7d56d1 100644 (file)
--- a/tools/python/xen/xend/server/pciif.py
+++ b/tools/python/xen/xend/server/pciif.py
@@ -301,8 +301,7 @@ class PciController(DevController):
         # if arch.type != "ia64":
         #    dev.do_FLR()
 
-        PCIQuirk(dev.vendor, dev.device, dev.subvendor, dev.subdevice, domain, 
-                bus, slot, func)
+        PCIQuirk(dev)
 
         if not self.vm.info.is_hvm():
             # Setup IOMMU device assignment

diff --git a/tools/python/xen/xend/server/pciquirk.py b/tools/python/xen/xend/server/pciquirk.py
index da7aa9a05715fe6055ab08a11d2b5dfc30fc10b4..71e9410d8036e1cd832f9710a63687836b1add30 100644 (file)
--- a/tools/python/xen/xend/server/pciquirk.py
+++ b/tools/python/xen/xend/server/pciquirk.py
@@ -11,18 +11,19 @@ PERMISSIVE_CONFIG_FILE = auxbin.xen_configdir() + "/xend-pci-permissive.sxp"
 PERMISSIVE_SYSFS_NODE = "/sys/bus/pci/drivers/pciback/permissive"
 
 class PCIQuirk:
-    def __init__( self, vendor, device, subvendor, subdevice, domain, bus, slot, func):
-        self.vendor = vendor
-        self.device = device
-        self.subvendor = subvendor
-        self.subdevice = subdevice
-        self.domain = domain
-        self.bus = bus
-        self.slot = slot
-        self.func = func
+    def __init__(self, dev):
+        self.vendor = dev.vendor
+        self.device = dev.device
+        self.subvendor = dev.subvendor
+        self.subdevice = dev.subdevice
+        self.domain = dev.domain
+        self.bus = dev.bus
+        self.slot = dev.slot
+        self.func = dev.func
 
-        self.devid = "%04x:%04x:%04x:%04x" % (vendor, device, subvendor, subdevice)
-        self.pciid = "%04x:%02x:%02x.%01x" % (domain, bus, slot, func)
+        self.devid = "%04x:%04x:%04x:%04x" % (self.vendor, self.device,
+                                              self.subvendor, self.subdevice)
+        self.pciid = dev.name
         self.quirks = self.__getQuirksByID()
 
         self.__sendQuirks()